Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 20:12:05 +0000 (12:12 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 20:12:05 +0000 (12:12 -0800)
commit9975dc7a31b85a93772697ae4e6cc19288a976ed
treee0f69d8db0058b0f58ce3126a4b77dcaaa892c6c
parentd23ea30d633db86ad8b4cd5975c8a0f3afc29b21
parent1d331ca4104ad6e1d3e3d9010fdf2ec2cf89f2e0
Merge from trunk.